Add patch to fix installed-tests

diff --git a/debian/patches/series b/debian/patches/series
index b73e566a722cdb595a2da78c1c1ef5f43703efb2..bad905f4e27b83271c591b91b67d138a5e94b497 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
+test-commit-sign.sh-Skip-a-unit-test-when-running-as-an-i.patch
 debian/Skip-test-pull-repeated-during-CI.patch

diff --git a/debian/patches/test-commit-sign.sh-Skip-a-unit-test-when-running-as-an-i.patch b/debian/patches/test-commit-sign.sh-Skip-a-unit-test-when-running-as-an-i.patch
new file mode 100644 (file)
index 0000000..1305103
--- /dev/null
+++ b/debian/patches/test-commit-sign.sh-Skip-a-unit-test-when-running-as-an-i.patch
@@ -0,0 +1,29 @@
+From: Simon McVittie <smcv@debian.org>
+Date: Tue, 5 Oct 2021 23:51:37 +0100
+Subject: test-commit-sign.sh: Skip a unit test when running as an
+ installed-test
+
+Signed-off-by: Simon McVittie <smcv@debian.org>
+---
+ tests/test-commit-sign.sh | 8 ++++++--
+ 1 file changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/tests/test-commit-sign.sh b/tests/test-commit-sign.sh
+index c3f9ce6..e175919 100755
+--- a/tests/test-commit-sign.sh
++++ b/tests/test-commit-sign.sh
+@@ -88,8 +88,12 @@ assert_file_has_content_literal show.txt 'Found 1 signature'
+ echo "ok pull verify"
+ 
+ # Run tests written in C
+-${OSTREE_UNINSTALLED}/tests/test-commit-sign-sh-ext
+-echo "ok extra C tests"
++if [ -n "${OSTREE_UNINSTALLED:-}" ]; then
++  ${OSTREE_UNINSTALLED}/tests/test-commit-sign-sh-ext
++  echo "ok extra C tests"
++else
++  echo "ok # SKIP test only available when running uninstalled"
++fi
+ 
+ # Clean things up and reinit
+ rm repo -rf